Updated based on our latest workflow