added isServing parameter