Updates from working on epc