Improve efficiency of goldberg_radzik