Updated with new local code (v1.1).