More work on proxy gen