Ajay/Dileep | #000 | Fixing smoke - updated selector