Added: if current_user