merge zobel's version and mine