Forgot to add one critical file; further reconciles the two versions