More debugging separation
Temporary debugging code added