Added structure for the system. Plot working