Applied changes to Linux version