This bad boy should be coming next year. Based on the MT09 platform, the XSR900 GP. 80's nostalgia. Ergonomics look sporty but not too crazy. Needs some Marlboro decals though...
As I mentioned, Yamaha have excellent service at their Nawamin Riders Club branch. Nice showroom as well.