some progress but still annoying
upgraded angular