implemented feedback from Peter
missed a few tags