Some changes. Added angular