Changed method names and stuff.