Anil/Vishnu - Changed the branch to use pure Angular instead of Compound