made edit .. first version