Making Preparation Efficient & Safe