Semi-final

Closer to production, added comments. Waiting on Chandra's approval.