Adding check to ignore 'none'