Added logging
Removed debug