Trying to reduce complexity