FINAL commit 7 min leaft