Update to CH10. Added CH11 stuff