Updated to new working snapshot.