More work on redesign