Added proper rendering, with rotation,  and other kinds of featuresw