added some comments for the TODO