pulled trigger out of if statement