tidying up and removing isCallNew property