Changed Todo's because project closed