Trying to simplify here