Upgraded to lates angular versions