Initial work on improved generation