Update - for race reloading / varies other fixes