After #6
After #6: replaced tub surround