Modifed Version. Compelte in all respects(not tested with Pronet E2E though)