some working changes