Re-factoring.
Add more debug information.