More Butts

Added support for a few more cases.