new version with angular