Finished upgrade system (+ Moved methods)