Windows+Linux Changes merged