done with new version; but a bit verbose. hm.