Final 1.1.1 version