added shower for the presentation on the 28th
merged