a couple of modifications