Cos375 SA2

Can you merge my changes? 

-Thanks,
Rob