#1&2 from the TODO list