Start of post-compo changes (cont. on branch)