Updated properly for *nix