small steps to ensure we do not reintroduce bugs in the macro