added 2 TODO if we have time