Updated to sync with Git