Runtime Update Fix and Overhaul