Improvement : Adjust codes.