Updated to streamlined workflow