improved user functionality
resolved merge conflicts