Removed debug lines, not working