Make much shorter and put angular stuff.