Changed to allow current_user