Updated System

Updated System and modified all necessary signals