Changed functions around.