Composing + Bugfixing