modify to utilize current_user