include walls in motion model