some changes on the workshop model