refactored p7 in shower