Tested and made it work a little better in Unix.