Eric's Additional Changes