Jhbate/data refresh

@nicolashery try this