added shower and other types