Almost converted to composer