Added NEW and TODO back