some revisions for Linux