start working on Caliper-based variant