Added staudis changes