Remove debug -- should all be working