Uncommented some codes I had commented out for testing purpose.