todo update + additional comments