Trying to figure out right combo

Forgot to commit other changes.