Better overlay among other stuff