Reorganised
Rejigged for composer