redesigned version. Not tested.