finished angular conversion