some little changes and rename