add current_user check