Changed the way the rendering and updates work