My first modication version.