Many, many changes from Lawrence d'Oliveiro