Added the EPOCH stuff