Updated to 2.5 final