More updates on the devise...