added baton stuff