Merged stuff to Angular