Composer improved