More work on design draft