need to fix rapid cicking and SOE