Uncommenting some code that was out while testing.