change in return statement
lalalal
merged some code