Finished #1555 todo list