updates TODO EVEN MORE