Added rendering, bug still exists