modify a little...