Formula improved (still ugly)