added the last todo comments