Changed names on a few methods