improved viewer a loooot