Phase-1 Final Changes