Changes from bug report 1 from Prachi Maam