Changes for final milestone