updated to v 2