travisfix + refractoring (graphics)