applied Hugo's version-3