TO-DO improvements