some small changes, just like the last commit