more devise changes