Major update and clean up
Resolve Conflict