changes from mat&vanner