version 1.1 and cleaning up