bug bix for production
resolved merge conflicts
Final set of changes