Updated ToyApp