Interim Updates on these classes