Breaking changesedit

There are a number of breaking changes when going from 5.x to 6.x