Fixed overlay, underlay and API