Final rebase. Start to work on this version.