Adding back in the commented changes