started modif according to Zoran