Comstack refactor
Refactored Version