improve speed (null condition) and knowledge (more verif)