some small modifies