New tree commit - many changes from old