update to handle epoch I think