upgraded to v6.1.0