TODO not updated, removed prior completed section