Fixed Rohit's Validation