Final Changes ALL