changed all click to on clicks