Moved and made new composer