Move whole delivery to private method