Added More Validation by Mahe