modified to latest workflow structure