this is second commit
reslove problems