Now using my run-mode module