updated ready for v2 - breaking changes