Updated validation ect.