Latest changes for linux