Before merging with angular