little changes and rename