Ugly debugging code added