Updates from MCPS

1 16 17 18