More log; Removed double validation;