home - refactoring stack to collection