upgraded to v 1.0