edited TODO
changed way of rendering