Final Changes

Done