replaced all on-click