using new calls and aligning setup format