Updated for the portion scope