updates for new Pc
merge conflicts fixed