modified changes for angular integration