Small adjustment in the used functions.