FINAL COMMIT 2