Redid Travis' changes (poor merge on my part)