New upgrade system works, but need time to implement