add more cases, hopefully speed things up