Setting up rendering and updating
Merge fix