Code freeze. Before custom-location