Reinstated more code
Finished reinstating all prior disabled code