a bit of modifications