FINAL COMMIT

MAY GOD HELP US!!!