Snapshot 3 - set of minimal changes. See FIXME.