added obstacle support