Updates from vs985-11C