Made it more cross-platform