Validation names and f****** error fixed