added new TODO's