Added limited quality control