task 7 back office and other little changes