fixed and mocked rendering
merge conflicts