Merge with work on linux