removed code from d.moradian added manually