Refactored: steps towards translation.