adapting to master branch of hersdata