Putting back previously commented out code