now works with validations