Added Riz's changes