is this TODO still valid ?