Made more multi-platform