Fixed the trigger stuff