UPDATE

Tidy, remove test prints