Added validation not really allready did it