updating to match implementation