oops, uncommenting some lines