Revised and added a TODO