updated epochandler.cpp