okay, merge to 2.0.0 for real this time