8.10-before
refactor
encapsulate collection