#validation adjusment