fleshed out the remaining matching cases