Attempt to lower complexity more