Validated and added some things