further changes to devise