Use new buttons