Refactored local stack
[#81180320]