10bis support - not complete