changed and fixed code

testsdgsdf