A tiny merge and rename. Added MT to use later maybe