added new values and calcs