updating code
merged