updated to v 3.0