Final commit 1.x version