improve validation
improved validation