Final Modifications

This version uncommented all the code