minor changes
resolved merge?