imporved angualr integration