Added basic angular logic