Moved methods around.