Fixing up devise