merged in initial changes for essex support