Updates to Legacy branch