Todo's updated