added lots of comments
making merge possible