more 2.1.0 features