upgraded to v7.0.1