changed structure to accomodate goutte (composer)