some additional changes on workflow