Updated shower and template