Our scripted solution saved one more button