some changes on work + generators