Begin to add cross platform check