Updates by Wallbridge & Gilbert