Missed out other code changes that went with split