Make it more OS agnostic