Moar changes to EPFD