Changes to Angular stuf
Fixed