modify a bit more