Change symbols and some little changes