More debugging code enabled...