The lines you added below make sense to me and should be there, but the TODO should remain, as you did another thing :)