Feature/border collision