added CLI mode check back in.