Bring in line with new methods