Added in the Partial Working