add some safe feature