Updated to match updated function