Added groundwork for change on select