Merging my changes back in