added 2 todo