More work on devise