Updates to utilize Infinity