Updated to 1.11 final