huge architectural fix