Updated mockup
Controller and correctness chart