Legacy Code added