Updated for s/both.