hassan second commit

sergo i made all modifications