Pull r3wald composer changes Part 2