improved case coverage