last commit before temporarily giving up