Reflect Travis's changes