TODOS added, temps deleted