Final modifications to simplify coverage choices