Fix bug
Add validation
Define repeatation