working on fixing devise