New coverage functions included, not tested.