comment out few Jacob edits & moved codes