a few changes we discussed