Some more chnages

more to come...