changed OS, prev commits recommitted