added original code and old test data