Converted to use spray-can