1st version with angular
1st version with angular