More work on generating