Added 2nd change from branch