Merge changes Brians Fork