some little changes again