Quick addition to retro gen
Preventing un-needed retro gen
Tweaked retro-gen code a bit