commented, removed debug stuff