reorder. added performance test