Changes for overlay without options