added angular changes from Shuotian