2.0 feature/bug request