Make it more cross platform firendly