updating to simplify