More rework with stack