converting to ulli's new proposed workflow