More work on proxy