Uncommenting forgotten code