cleaned up, finished dumb trigger