Modern redesign by Peter Kassenaar