Initial changes to devise