Adding when/where section