rename && a little changes