Updated to latest snapshots