Version 2.0 with angularjs