Improved debuggin very very slightly.