Added TODO for self