All the same but validated with small cjanges