Making version 2 updates