update Shop & upgrade Validate
changes up