bugfix for production1
resolved merge conflict
added notes completed coding