new look

with query