security fixed
validation fixed