Changed TODO's