Remove oil pump assembly from front cover and inspect gears and both wear area's on the front cover and oil pump cover for damage. If there is signs of wear on the gears and covers replace all that are damaged do not just replace the gears. There is usually damage to the front cover scaring on the aluminum wear plate. Replace front cover if it has wear. Then drop the oil pan and pick up tube and clean all debri out of pan and pickup tube. Then remove valve covers and find the rockers that fell apart and other wire clips that broke and replace them. Failure to do this will take out your new oil pump in days or even hours.