fixed code
fixed code
updating code
merge