make these match more for the long case