Made Infinity friendlier