Undid flip stuff + reduced tree count