added angular stuff, not very useful