TODO's updated