forgot some items from previous commit