Uncommenting and more changing