Updated workflow