last commit before i change to extreme sailing