some changes i do not rememeber