Implementation of the OriginalModel.
Minor bug fixes.