Moved ConnectionId up to Khaan

Minor mods