preparing for cross platform support