Made Infinity even friendlier