Completed updates

Completed updates, ready for submission