new colours, better query, refinements