updates TODO: Immediate, Issues, Future