Attempt to reduce complexity