Changed composer slightly