change syntactic sugar slihgtly
add epochmaker