added angular and few other changes