some changes @ work