Composition overhaul!