More work on generation