synched. my fork with RC-2.3 and changed LOC to new visitor interface