More work on linux version