newchanges almost final version