Add some additional button variables for more specificity;