Made Nick's Changes