additions from original to include c8860 & u8860