Mel's modifications incorporated.