Commented out error check & changed comparisons