Made changes for Linux