Updated to handle final submission format.