validation rewamp finished