added ideas from facebook TODO doc