Overlay is more or less working now