Adding the modifications to the windows version