Changed the system design