Change to version 1.6 (Working)