final version for 1.1.2