Refactor
Fix mode
Refactor
Add obstacle