revised smoking bill