Updated System

All Changes from the Demo