updated to include angular defs