(refactor) restore old style