Changed the testing code back, no enhancement at all.