mods to make it angular compatible