New version with less errors.