add comment, refactoring stack using new architecture