Ran through validator + edited