changed up graphical, model and simplified computation