added function definition
merging function definitions