wow! such refactor!