fixed path defns
hopefully no conflict
dd: trying to complete merge