Updated with System Model -JH