Updated to v1.1 code.