Change to work for both os's