Wallfollower with states again