Changes to buttonSelect