some small modifications
added nwEPC
Changes
Hopefully fixed conflicts