incoperated @gharlan feedback