Improved 1.1 and solved 1.2