many changes with devise