Uncommenting stuff as well