Fianl commit 1.2.5