changes for CR workshop