Improved the code based on current status.