Changes for final run