Added more wrapper, commented out another noisy debug line