Updated TODO-List