CHANGE: refactor