Consistent 'connection' rather than 'server' in - part 2