geometry checks in place, trying different strategies