finalized version 2 updates