added when and where section