Finish up overlay - ref #44