Updated to Angular JS