re-generate according to spec (#23)