big updates to improve playbooks and flow