Further modifications to when_where section