More changes

Changes from Work 14th Aug