Make code more portable
Make code more portable