adding functionallity
adding functionality
manual merge