initial contribution to XSR Connex
minor changes