Major code push--so much for atomicity