Imporoved model/renderer