further devise edits