Modified to remove debug message