Draft version of generator