Final setup commit