Review. TODOS added