updates, removed debug