Updates to changes still struggling with 5

Work