updating to match protocol