Updated to use newer method.