chaged some TODO items