additions from mac mini
fixed conflict