validation in progress
validation in progress - minor refactoring