Function definition has been refactored ...