preparing things to v2