Uncomment some code which I commented out for unknown reasons