angular way working 100%
finalized
finalized angular