CrossPlatform

Made few changes