Xmarty 2.0