Updated everything for final submission