merging
updated code