added user functionality
merging