changed dependency order so angular is first