Added ng defer, not finished yet