Final Changes by me.