Fixed from and removed debug