Updated to final report