Moved few methods around.