last commit working on linux, trying to reduce wait time now