did some basic mod.
merged.