Draft new anti-tobacco law