added spray and foam
merged