Improve for unix OS