I've been fixing this with Efraim, this is the second version.