validation and logging chnages