Refactored to new launch/update system
New launch/update system + a few changes