revision: resolution
refactor