More work on addressing