added functionality
merge