Added Gabriele's viewer implementation