added 2 todo's