Updated Service Inclusive Calculator