a more reliable/robust/less complex version of previous commit