Some more chnages