Final Updates to changes