Reverting to Legacy version and tagging
Legacy with fixes to avoid warning messages