commented and removed debug parts