modified current_user