Adding some untested code for normal generation