Recommit, with fixes: