some small modified.