added abit of angular stuff