Fixed Previous Merge Issues