Added Validation. Does not work.