Added plunger and reconfigured walls