updated to 2.10 final