Rendering improvement thanks to Father Jacques Peron
Start implementing tags