Updated to work with the new toolbar.