Revert to use onclick solution