some little changes to pass the tesrts