Updated to remove "a" and "b" buttons