Updated TPS Task 2