modify so it uses current_user