Update from version 1.
This is version 2.