added new code
added more code
merged code