added TO DO comments