change on.tap to fireAll