some uncommenting for good merge