updated code
merged conflicts