More work on design