some todos removed, some todos added