Worked on validation