refactor code a little
trying to add validation - part 1
temporarly disable validation