updated with current_user