Bring back overlays and test a new one