- Moved barrier outside of the runon
- fixed using Props