Upgrade to Ver 3.6