many changes twoard final version