Updates for final submission