removed eric's test code