Upgraded to features 2.0