made changes to accomodate both the normal test as well as the performance test