uncommenting earlier changes made for debugging