updated from dev

probably going to get i a bit of a pickle now...
no change