First version with bad display support