Feature/new renderer