TODO: update with a few suggestions