Update 8

Cleaning up