Commit Ali's last changes