copy 2.0 to 1.9.3