reorganised sketch - still ugly