Fixed part D still needs to be cleaned up.