updates to continue the conversion to angular