More 2.1 features
Some background