removed debug stuff, for real this time