v. 0.26.1, optimisations/minor refactor