Updated Critter and Trainer