Preparation for algorithm change