add a few things left out