removed all cl almost
major stuff