v. 0.21, minor refactor