New ace build and folding logic