Started to work on code portability.