More work on overlap generator