All I did was take 1.2 and replace it in here. Not the best merging technique