made changes to keep the important shortcuts, need to do this for the 1.8 branch also