updated for v2 platform