Added 2i to replace most of the coverage commands.