Mention two-phases so we can cherry pick