reworked introduction
resolved merge conflict