Added rendering, still something wrong