Added Internal triggers and fixed advanced mode