More Task 6 Additions