Added substring() back in.