Change Model to contain Image so rendering is much faster