Added revision number for quick checking
Breaking rendering to simplify it